Code cleanup <Karthik>