Fixes and code removal