Cleaning up some files

Reviewers: supertri

Reviewed By: supertri

Subscribers: shipshape

Differential Revision: http://172.149.211.130.bc.googleusercontent.com/D8