Removed modularized functions