Clean up of code. Rembonite is dropping.