removed all crap
fixed merge issues