Removed or renamed unnecesary components, added inits