removed not so important bits of code