Basic code and environment cleanup