Few changes, nothing big

Removed and changed a few things, nothing much.