Cleaning up old unnecessary items
Merged changes