Removed calls to deprecated methods
Removed semicolons