Removed excess code focused functionality