Removed additional features; Fixed build warnings