Remove spike method
Remove unused file
Remove TODO
Consolidate argmument assignment
Indent export action