Fixes and code removal 2