Now that you have cleaned out the trap, make sure you run the water for a while after shaving and flush it out. I used to have to clean mine out periodically and sometimes use a little drain cleaner....