Moved some methods to TimetableUtils where they are better suited, removed some unnused and unnecessary methods from TimetableProvider, tidied up some methods