Fixed build issues, notifications, removed commented out code