Removed aliasses and functions
Inital version
initial version