removing broken code
tweaks