Removed unnecessary parts