Cleanup dead code and README