Removed a lot of changes for merge