Removed more uneccesary components