Cleanup & removing redundant/deprecated stuff