Removed commented out code. MJ-45