Removed empty functions