Remove unnecessary files

Also move class as inner static where right.