Removed Unused Components

Time