(cleanup) cleans some codes