removed comments and old code.