Removed not used function
Removed construct returning null