Removed null check in constructor, removed un-used file