Code cleanup
Move unsupported methods to end of file