Fixes, removed files.