Removed schedule parser code, clean up