Start cleaning exceptions + javadoc