Removed extra stuff