Removed debug + added small garbage cleanup