Fix Author, remove unecessary code.