Removed fake mindmap and cleaned up some code