Deleted test/commented code; final version