Remove functions which are now unused
Move Table/TableContainer to top of file