Get rid of imports and mark Base methods explicitly. Also clean up exports