Removed unused components from package