Refactor and remove obsolete info