Updated readme & cleanup of unused code